Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 16:33:27 +0000 (09:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 16:33:27 +0000 (09:33 -0700)
commit267665bb6201fa2c6f6a0c04de90005d63389716
tree80c8bf2361fad26a8628496d2bbb41758bc7ac41
parent8af35b7301a827a8a391be20ecd9e2b37c225ab1
parent4b51f21ea57cde5a9aa2c34c46f0af779e95d97a
Merge from trunk.